Fixes as Chrys finds errors.