A few more recommended changes