Fixed "Vassal of ---" bug
General fixes