A few fixes in the Core