Fixes of all minor errors across whole app