Fixes for config.json vs config.js

Otherwise seems to work for me (I didn't test the S3 stuff)