lint warning fixes