Small corrections to make tests run.