Agate and Mica server changes