Resolves some lint issues