Minor changes to adapt development workflow.