More synchronization wrappers, plus fixed a logic error in the delay skipping.