[PATCH conductor 0/2]: Minor cleanups