Upgrade to ws v0.4.30 + fixes