Few fixes for 1.1