[PATCH conductor 0/2] Fix two bugs tangentially related to 761284