Fixed a couple of bugs. Legacy stuff breaks when a file changes.