Fix issues found with go-deje demo integration