Some more tweaks to the modified backend.