compatibility issues

fixed sopme compatibility issues