Fixes to work with latest Config::MVP