safety issues fixed