Fixed engine timing issues