Fixed a handful of minor bugs

 Bugs: XWALK-2873, XWALK-2891, XWALK-2969, XWALK-3071, XWALK-3075, XWALK-3079