Configuration Fixes