Cleanups for dev environment

Minor tweaks to improve experience on a clean dev environment.