HDL generation fixes.