More cmake fixes