Various fixes
Another print_r forgotten