Some HDL fixes.