Fixing some timing issues