Fix some broken @var comments and add missing uses