Updates to run with modelsim