Final bugfixes for RELEASE-0.1