Fixed some of the warning messages during build