Semaphore conflicts fixed