Version 1.1 fixes

Version 1.1 fixes