Another little abm fix, and diff cleanup