Fix some issues (narrator + helpers)