Code review issues fixed. Compatibility issues fixed.