Fixes for multi-backend