Fix errors with initial stomp 1.1 commit.