Fixes with Admin service and server allocation