a few changes to make tests pass again