Townsfolk: Minor bugfixes