backport useful fixes