Bug fixes and updates before Derbycon. Still need DOMAIN_DN string validation