Some more fixes for building as a developer