Fixes for some timing issues