Some minor issues resolved

Some minor issues resolved