Some minor code changes because of changes in the JS compiler `Options`