Fixed some issues with prefixed models.