More lint warning fixes.