Couple small changes and a fix for a mistake.