Minor cleanups to some pinotrc files