These changes are just compiler warning reduction :)