Rodolphe Duge de Bernonville <rod@idealx.com>
    Fixed some odd bugs when we're under heavy load