Add changes missed in last commit