#5025 ENH: Several fixes proposed by @jtratner