fixes to citadel with new strict mode