Small, miscellaneous fixes

That's orthogonal to this PR. To follow the API changes guide, discussions of name changes should be started on pylearn-dev, so that people they affect can be aware of them.