Cleanup, ushort serialization issue, configureAwait fixes