Address some lint suggestions