Small fixies

I will continue to closely inspect the code that I commit