Fixed a couple of failing doctests.
More modifications to make doctests and travis happy