Minor library hierarchy fixes