Fix some validation errors.  Misc. clean up.