Tiny changes before the pig removes sem_wait