Fix some doc and declarations.