fixes for Treasure Hunter