A few small cleanups (#3046)

2 files changed