Added back a bunch of fixes for lint that had somehow gotten merged out.