marker class fixes