Couple of minor bug fixes
Merge branch 'master' of https://github.com/energia/Energia