More lint warnings