Fixes that allow switching between different models