Minor compat fixes
More minor changes
More compatibility