Various enhancements to development mode