Minor issues fixed and compatibility tested.