EXPERIMENTAL: More backend improvements