Various HDL fixes.