Fix @#$#^! warnings...