Last backend fixes