Some changes from 1.4

These are changes from 1.4 that seem to be missing in 1.5 alpha.