Minor tweaks for development