bugfixes picked up from live runs