minor core lib changes