Another few fixes