Fixed run-time crashes caused by updating to the new Clang.

Signed-off-by: Dimitar Dobrev <dpldobrev@yahoo.com>
Merge pull request #329 from ddobrev/master

Fixed run-time crashes caused by updating to the new Clang