Adjustments for libHeaven/topic/uncrappify1

Opening a PR so I can easier track my changes