Fixes for JS isues in SS3.1.2