A few fixes...