Last set of fixes to correct this problem