Small trainer fixes