Generator controller fixes