- Fixing application functions