Fixes for app