Fixes + doctests