Fixed vivado related xsthammer bugs