Improve MTU handling