Yup! Glenn also mentioned this in the Mac code. I'll do them together.