The queue replacement by a sync block now works fine
More cleanup