CND fixes and servlet container auth