Emergency fixes (mostly).
Merge branch 'master' of github.com:RichardEvans/EL