Little fixes to make it fully compile on ubuntu with cmake