Fix 5+1 issues for project