Fix a few problems introduced in previous commit
Merge pull request #1624 from ussuri/switch-file-controller-to-event-bus

Fix a few problems introduced in previous commit