More missing pieces from last commit