Fixes for two trainers