Fixing minor lint errors and compilation issue with UI test due to var renaming.
Merge pull request #36 from lararennie/label_fixes

Fixing minor lint errors and compilation issue with UI test