* Lots of build fixes due to a very bad commit with the merge not