EMC fixes

GraveStones, Marble, Thaumium