A few fixes....