little improvements in the Core