Some more minor chages