Bugfix for issues encountered by Voldemort & Distributed Test Framework