Minor changes, possibly code breaking