Fixes some timing issues