Fix samples for M5