A few minor adjustments to compile here vs. on my laptop