pincite and short form fixes