Bug fixes courtesy of my proofer extraordinaire.