Fix general code errors as well as .probject file