Resolving minor issues