Fixed bugs, turned the XephyrInventoryWorkaround class into a helper.