Improved dev mode handling.