2002 fixes