Fix up more code for the Wheatley governor

Change-Id: Ic66e5ef967c0b7675f0e05dbcdc392121e1e715c
Signed-off-by: Josue Rivera <prbassplayer@gmail.com>