[WIP] Updates and fixes

See codio/client#2740.