Fixing minor lint errors and compilation issue with UI test due to var renaming.