Incorporate some js-deje improvements