Warnings fixes

Some minor reduction in build warnings