Resolve some lint warnings