Fixes to match docs