Bug fixes for 1.2.0 release