Small bug fixes and usability tweaks for deployment