Fixes for MT5