bugfixes for in the wild