Minor fixes to development setup