two FTBFS bugfixes from Debian