Fix workqueue errors

Change-Id: I1f55f48661cde82f019b4e91ca9c95ad022f01b7