Fixes, doctests