Various VHDL fixes