Making some changes for the sake of system stability