Another few fixes...