Fixed some governor problems