More backwards compatibility
Fix coveralls, yay