API Engine 2.1: fixed a couple other issues in dependency loading.