Some changes to help tests pass