Misc fixes 1

Here's a few tweaks that I needed to get your fork working with my repo