Changes to persuade Stove to work