XCB fixes

This patch fixes #85