Adjustments for libHeaven/topic/uncrappify1