Fixes for application context