Minor tweaks to ensure mvn: protocol is active as soon as possible

This should help with IT stabilization