Some minor cmake cleanups