some Citadel server fixes