Quick fixes from 1.4

There was some minor problems that didn't seem to be noticed in testing.