More fixes to Elite trainer virtual power calculation