Application Fixes