Fixed minor annoying errors