Enable prior changes and fix linker errors

Built and test-run on Debian Sid.