Updates for some missing code.