Fine tune the Safe changes