Resolved compatibility issues and coding standard issues as well.