Make sure the project can be run in 2014

Couple various fixes that make run app even in 2014!