Even more GraveStone fixes.