Fix model refs