Fixes to project