Some tweaking to project and solution for no decent reason