Fix some stuff that was hacked on recently just for pylearn2.