More general fix ups.