Other fixes regarding compatibility-2