Fix model issues