Fixing latest changes.