pdf2john fixes for bugs triggered by CMIYC 2013 files