Some minor mofications