A variety of bug fixes, etc.