Minor code fixes
Merge branch 'master' of https://github.com/iredmedia/fx-results-prototype