More Elaphant changes as well as small tweaks.