Minor fixes

That's what they are. Check the commits