Small changes to make it work with Hadoop 0.20.2-cdh3u5

Ben,
Please review this my small commit. It's going to make happy a lot of people out there.
Thanks,
David