fixes to make citadel work on server
merge