Fix some timing issues

See title