Governor Fixes