Diamond Hunter: Minor Fixes

Minor Fixes