Sync with updated systemverilog tools