Fix models/collections constructor calls