Properly generate logical file ids. Fixes #1515998.
Also correct typo in Control.mapping.
2 files changed