Minor adjustment to admin and models.