Small fixes needed to running component through ergatis
Merge branch 'master' of https://github.com/jorvis/ergatis