Fix miscellaneous lint issues