Bugfixes all over the app