Fixing obscure mistakes that I come across