Small fixes to project