fix issues with core_lib