Small bug fixes and dev mode