Two fixes to my previous commit. /ht @astorije.
Two fixes to my previous commit. /ht @astorije.

rrrene/echidna,catataw/echidna,catataw/echidna,rrrene/echidna,rrrene/echidna,w3c/echidna,w3c/echidna,w3c/echidna,catataw/echidna