Minor changes to master and solution files