Fixes made to Vachon06-July24