Workqueue fixes and api_key change