Patched to take care of some -xlint warnings