A couple more fixes in order to pass our tests