Some fix and improvements - Update to 1.8.6