Fix couple bugs @qadan found in QAland.
Merge pull request #41 from jordandukart/7.x-FLVC-60

Fix couple bugs @qadan found in QAland.