Misc changes on the way to the project