Misc fixes

@gsathya my bad. I thought this was a thing for contributors. I'll merge now