Further enhancements for using with local development.