a few minor fixes I forgot from the previous one