Some cmake cleanups