Fixed bugs discovered after implementing modular backends
