Fixes for 0.6.0-M1, encountered during QA