Fixes to current project