Safety measures (remove prisms, fix warnings)