Malcyl smoke test fixes