Small changes again (Need to check SyncPrimitive again and the whole server package