Corrected some casting so the build would be clean!!