Couple of cleanups (#2207)