Import a few fixes