Debug fixes found during synthesis.