Fixes to pass tests, now passing on 2.6 and 2.4