Additional pieces missed in last commit