Little cmake updates