TAVERNA-977 - Fix Engine build warnings

[Chalana Madusanka]

Hi, I am an undergraduate student of faculty of engineering university of
peradeniya and I would like to contribute this bug.

Thank you.
kind regards,
Chalana Madusanka.