Various changes for making Vivado build