A couple cleanups from last commits