Minor impl changes