EnginioModel fixes