Obligatory fixes to cmake