Fixes in v1.1b