resolving minor issues