Minor improvements to multi-backend support