Fix issues found against swyd 1.1.CR1