Configuration and Application Fixes