more idiot fixes