Cleared obvious compile issues