Adds recommended changes on 2.4