Small cmake fixes