fix some tumbleweed bugz