-Fix 5.3 types
-Fix haddock comments