A minor fix and enhancement :-)