[PATCH conductor 0/4] Misc small patches