corrections to fix failing tests