Compatibility fix & typo