Daisy-18 class fixes