Coding Consult

More 2004 coding changes