diff --git a/ivl_target.h b/ivl_target.h
index 71a8acf02..50903fffc 100644
--- a/ivl_target.h
+++ b/ivl_target.h
@@ -688,6 +688,9 @@ extern unsigned long ivl_expr_uvalue(ivl_expr_t net);
   /* any expression */
 extern unsigned    ivl_expr_width(ivl_expr_t net);
 
+extern const char* ivl_file_table_item(unsigned  idx);
+extern unsigned ivl_file_table_index(const char *);
+extern unsigned ivl_file_table_size(void);
 
 
 /* LOGIC
@@ -851,6 +854,9 @@ extern unsigned    ivl_udp_rows(ivl_udp_t net);
 extern const char* ivl_udp_name(ivl_udp_t net);
 
 
+extern const char* ivl_lpm_file(ivl_lpm_t net);
+extern unsigned ivl_lpm_lineno(ivl_lpm_t net);
+
 /* LPM
  * These functions support access to the properties of LPM
  * devices. LPM devices are a variety of devices that handle more
@@ -1620,8 +1626,8 @@ extern ivl_attribute_t ivl_process_attr_val(ivl_process_t net, unsigned idx);
  */
 extern ivl_statement_type_t ivl_statement_type(ivl_statement_t net);
 
-extern const char* ivl_statement_file(ivl_statement_t net);
-extern unsigned ivl_statement_lineno(ivl_statement_t net);
+extern const char* ivl_stmt_file(ivl_statement_t net);
+extern unsigned ivl_stmt_lineno(ivl_statement_t net);
 
 /*
  * The following functions retrieve specific single values from the
diff --git a/tgt-vvp/eval_bool.c b/tgt-vvp/eval_bool.c
index f92d073c6..882170d6e 100644
--- a/tgt-vvp/eval_bool.c
+++ b/tgt-vvp/eval_bool.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005 Stephen Williams (steve@icarus.com)
+ * Copyright (c) 2005-2008 Stephen Williams (steve@icarus.com)
  *
  *    This source code is free software; you can redistribute it
  *    and/or modify it in source code form under the terms of the GNU
@@ -16,11 +16,11 @@
  *    along with this program; if not, write to the Free Software
  *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
-#ident "$Id: eval_bool.c,v 1.4 2005/12/07 03:43:30 steve Exp $"
 
 /*
  * This file includes functions for evaluating REAL expressions.
  */
+# include  "_pli_types.h" /* To get the UINT64 format */
 # include  "vvp_config.h"
 # include  "vvp_priv.h"
 # include  <string.h>
@@ -64,7 +64,7 @@ static int draw_number_bool64(ivl_expr_t exp)
       }
 
       res = allocate_word();
-      fprintf(vvp_out, "   %%ix/load %d, %lu;\n", res, val);
+      fprintf(vvp_out, "   %%ix/load %d, %" PLI_UINT64_FMT ";\n", res, val);
       return res;
 }
 
@@ -84,19 +84,3 @@ int draw_eval_bool64(ivl_expr_t exp)
       return res;
 }
 
-/*
- * $Log: eval_bool.c,v $
- * Revision 1.4  2005/12/07 03:43:30  steve
- *  Include stdint.h if it is present.
- *
- * Revision 1.3  2005/12/05 21:20:55  steve
- *  Some systems donot have stding.h?
- *
- * Revision 1.2  2005/09/19 20:17:59  steve
- *  Include vvp_config.h instead of config.h
- *
- * Revision 1.1  2005/09/14 02:53:15  steve
- *  Support bool expressions and compares handle them optimally.
- *
- */
-
diff --git a/tgt-vvp/vvp_process.c b/tgt-vvp/vvp_process.c
index 09dc57164..153add4b0 100644
--- a/tgt-vvp/vvp_process.c
+++ b/tgt-vvp/vvp_process.c
@@ -773,6 +773,7 @@ static void force_vector_to_lval(ivl_statement_t net, struct vector_info rvec)
 	    break;
 	  default:
 	    command_name = "ERROR";
+	    command_name_x0 = "ERROR";
 	    assert(0);
 	    break;
       }
diff --git a/vpi/sys_lxt.c b/vpi/sys_lxt.c
index ef1f93927..708aa4849 100644
--- a/vpi/sys_lxt.c
+++ b/vpi/sys_lxt.c
@@ -325,7 +325,8 @@ inline static int install_dumpvars_callback(void)
 
       if (dumpvars_status == 2) {
 	    vpi_mcd_printf(1, "LXT warning:" " $dumpvars ignored, previously"
-			   " called at simtime %lu\n", dumpvars_time);
+			   " called at simtime %" PLI_UINT64_FMT "\n",
+			   dumpvars_time);
 	    return 1;
       }
 
diff --git a/vpi/sys_lxt2.c b/vpi/sys_lxt2.c
index 5e28fc077..6564a5c54 100644
--- a/vpi/sys_lxt2.c
+++ b/vpi/sys_lxt2.c
@@ -323,7 +323,8 @@ inline static int install_dumpvars_callback(void)
 
       if (dumpvars_status == 2) {
 	    vpi_mcd_printf(1, "LXT2 warning: $dumpvars ignored, previously"
-			   " called at simtime %lu\n", dumpvars_time);
+			   " called at simtime %" PLI_UINT64_FMT "\n",
+			   dumpvars_time);
 	    return 1;
       }