CS fixes outside src dir