Fixed bugs with new project id