backward compatibility fixes