Add a few other suggested changes