More tweaks and fixes to Templar and Hospitaler vassalization as KoJ