Yet another round of minor bug termination