Feature/cmake v2 fixes