[dream/f36] (2 commits) ...Fixed FTBFS