More attempted fixes and some lint cleanup