Reimplemented small fixes
Tag as 2.10.6