Fixes up the backend a bit