DES: Minor Design Fixes.