Bug fixes for 1.2.2