Fixed some lint warnings