Fixing some tiny things