Fixes for Xilinx tools and simulation