Fixes needed for project