Fix last coverage / lint issues