A bunch of warnings fixed due to implicit conversions
This will create a new commit in order to revert the existing changes.
