Minor changes. Add missing bits.