Cleaning up some compilation tasks