makedist.py,index.py: Fixes for multiple device support