SimX changes for clang compatibility