Pre-1.4 changes.
1.4 fixes.