Bug fixes for 1.1 update