tweaks to add Questa support