Trending Underground Fixes (#389)