Minor fixes to project arch