Some minor touching up