Fixing more upgrade to 1.7 compiler errors. SOB
Resolved merging issues