fixes by dsal on #go-nuts