Some timing issues fixed.