Fixed semaphores
Cleanup