Header/Application Fixes