Fix annoying errors