Fixes DEVELOPER-240

Also correctly a JavaScript TODO comment