Fixes for Release 1.1. build 13