Fixed a bunch of lint issues...