Many training fixes