Diamond Hunter: Minor bugs fixes

Minor bugs fixes