Fix doc blocks
Fix upgrade