Lots of tiny bug fixes that were freshly introduced.