Add mt fixes will only be useable for a short time
minor Cleanup