Fixed all 10/06 issues