Address review comments, fix signatures that the docs lied about