Several fixes in backend :)