* hand fixes for temp parser