CMakelists fixes