Add some cmake improvements