Just a few fixes