few fixes for 3.0 #310

Closed segevsh closed 9 years ago