More backwards compatibility fixes and lint tests returned