Fixes for applications

Fixing application stuff