Abe tweaks

Two small fixes tested several months in Abe.