Ramdon fixes

Some ramdon fixes I came across while I was working on other stuff