Bugfixes, backwards compatibility and work towards backend usages