fixes to pass our tests