Final fixes
Final changes for 1.2.0