some minor fixes and core version depend