Slowing tweaking code so buildbot passes