Misc lib changes, pre-reorg