Fixes to prevent issues with current app/current facade.