Several fixes for project