More lint warning fixes