Fixes

Few assorted minor fixes/tweak intel folks have done