Fix training issues