Minor backend changes