Some fixes on hadoop module