Small fixes from PR comments and broken test