Fixes to remove build warnings