Governor fix - re-add support for later toolchains