Fix last of lint issues leading up to packaging