In class fixes...