Fix minor timing issues