Fix up more code for the Wheatley governor