scons compile fixes with Rudi's latest changes