More logging
Fix bad arguments