fix bugs spoted by Jay

Jay required fixes are done
Merge branch 'abdullah_4.6' into _MEE
autobot changes