More GraveStone fixes.