Fix some lint warnings...