Other small changes to davide trainer