diff --git a/wally-pipelined/config/rv32ic/wally-config.vh b/wally-pipelined/config/rv32ic/wally-config.vh
index c3d8faab4..7caf1a004 100644
--- a/wally-pipelined/config/rv32ic/wally-config.vh
+++ b/wally-pipelined/config/rv32ic/wally-config.vh
@@ -54,6 +54,9 @@
 `define MEM_ICACHE 0
 `define MEM_VIRTMEM 0
 
+// Address space
+`define RESET_VECTOR 32'h80000000
+
 // Test modes
 
 // Tie GPIO outputs back to inputs
diff --git a/wally-pipelined/config/rv64ic/wally-config.vh b/wally-pipelined/config/rv64ic/wally-config.vh
index baa035bd2..3a75d0795 100644
--- a/wally-pipelined/config/rv64ic/wally-config.vh
+++ b/wally-pipelined/config/rv64ic/wally-config.vh
@@ -54,6 +54,9 @@
 `define MEM_ICACHE 0
 `define MEM_VIRTMEM 0
 
+// Address space
+`define RESET_VECTOR 64'h0000000080000000
+
 // Test modes
 
 // Tie GPIO outputs back to inputs
diff --git a/wally-pipelined/lint-wally b/wally-pipelined/lint-wally
index c1c03a29b..abcb96fa4 100755
--- a/wally-pipelined/lint-wally
+++ b/wally-pipelined/lint-wally
@@ -1 +1 @@
-verilator --lint-only -Isrc src/*.sv
+verilator --lint-only -Iconfig/rv64ic src/*.sv
diff --git a/wally-pipelined/src/datapath.sv b/wally-pipelined/src/datapath.sv
index 1ca042e83..77b9b6f10 100644
--- a/wally-pipelined/src/datapath.sv
+++ b/wally-pipelined/src/datapath.sv
@@ -25,7 +25,7 @@
 
 `include "wally-config.vh"
 
-module datapath #(parameter PCSTART = 32'h80000000) (
+module datapath (
   input logic clk, reset,
   // Fetch stage signals
   input  logic        StallF,
@@ -110,7 +110,7 @@ module datapath #(parameter PCSTART = 32'h80000000) (
   logic [31:0]     nop = 32'h00000013; // instruction for NOP
 
   // Fetch stage pipeline register and logic; also Ex stage for branches
-  pclogic #(PCSTART) pclogic(.*);
+  pclogic pclogic(.*);
 
   // Decode stage pipeline register and logic
   flopenl #(32)    InstrDReg(clk, reset, ~StallD, (FlushD ? nop : InstrF), nop, InstrD);
diff --git a/wally-pipelined/src/pclogic.sv b/wally-pipelined/src/pclogic.sv
index 5ae83181f..9f550655a 100644
--- a/wally-pipelined/src/pclogic.sv
+++ b/wally-pipelined/src/pclogic.sv
@@ -25,7 +25,7 @@
 
 `include "wally-config.vh"
 
-module pclogic #(parameter PCSTART) (
+module pclogic (
   input  logic            clk, reset,
   input  logic            StallF, PCSrcE, 
   input  logic [31:0]     InstrF,
@@ -37,9 +37,6 @@ module pclogic #(parameter PCSTART) (
   output logic [`XLEN-1:0] InstrMisalignedAdrM);
 
   logic [`XLEN-1:0] UnalignedPCNextF, PCNextF, PCTargetE;
-//  logic [`XLEN-1:0] ResetVector = 'h100;
-//  logic [`XLEN-1:0] ResetVector = 'he4;
-  logic [`XLEN-1:0] ResetVector = {{(`XLEN-32){1'b0}}, PCSTART};
   logic misaligned, BranchMisalignedFaultE, BranchMisalignedFaultM, TrapMisalignedFaultM;
   logic StallExceptResolveBranchesF, PrivilegedChangePCM;
   logic [`XLEN-3:0] PCPlusUpperF;
@@ -52,7 +49,7 @@ module pclogic #(parameter PCSTART) (
   assign  PCTargetE = ExtImmE + TargetBaseE;
   mux3    #(`XLEN) pcmux(PCPlus2or4F, PCTargetE, PrivilegedNextPCM, {PrivilegedChangePCM, PCSrcE}, UnalignedPCNextF);
   assign  PCNextF = {UnalignedPCNextF[`XLEN-1:1], 1'b0}; // hart-SPEC p. 21 about 16-bit alignment
-  flopenl #(`XLEN) pcreg(clk, reset, ~StallExceptResolveBranchesF, PCNextF, ResetVector, PCF);
+  flopenl #(`XLEN) pcreg(clk, reset, ~StallExceptResolveBranchesF, PCNextF, `RESET_VECTOR, PCF);
 
   // pcadder
   // add 2 or 4 to the PC, based on whether the instruction is 16 bits or 32
diff --git a/wally-pipelined/src/wallypipelinedhart.sv b/wally-pipelined/src/wallypipelinedhart.sv
index 54e55d756..25702a84a 100644
--- a/wally-pipelined/src/wallypipelinedhart.sv
+++ b/wally-pipelined/src/wallypipelinedhart.sv
@@ -25,7 +25,7 @@
 
 `include "wally-config.vh"
 
-module wallypipelinedhart #(parameter PCSTART = 32'h80000000) (
+module wallypipelinedhart (
   input  logic            clk, reset,
   output logic [`XLEN-1:0] PCF,
   input  logic [31:0]     InstrF,
@@ -70,7 +70,7 @@ module wallypipelinedhart #(parameter PCSTART = 32'h80000000) (
   logic       FloatRegWriteW;
            
   controller c(.*);
-  datapath #(PCSTART) dp(.*);
+  datapath   dp(.*);
   hazard     hz(.*);	
 
   // add FPU here, with SetFflagsM, FRM_REGW