Fixes for project