Consistency fixes and licensing information.