CODE: Safety changes.