Stop the stupid autoconfigure from happening
More lint cleanup