More lint warnings cleaned