Tweaks for LWS integration
merge