Other fixes regarding compatibility