A few post Part5 bugfixes