JS-252 More bug fixes to prior commit.