Fix for accountopt, cosmetics and fix for union definition.