fix issues, backport to galago 3.3