Small changes to improve system stability