Cleaned up some lint warnings