MLHR-939 #resolve

Also made a few changes to pass JSHint.