Drop scons file and other small changes