More fixes to pass tests