Some fixes

See commit log for full descriptions. This has not been built, which brings up a question: How do you minimize the requires like in your "skifree.min.js" version ?