Fixes in app