Misc bugfixes in preparation of RC1