Safety fixes.