Debug fixes for errors found during synthesis.