Lots of minor tweaks to work with our local setup