Fixed worker and index issues