application fixes
application fixes