Code review: mpclient sync and additional cleanups