Bug fixes, actor_ declared twice