Bunch of fixes; also 8.04-build-fix included

some corrections for our present days