Random smaller error message fixes/improvements