Fixes for several pinfo formats...