cmake fixes