Changed some annoying errors