Few fixes for 1.5beta