Fixes for dewey test