Annoying errors fixed