Fixing backwards compatibility issues;