Miscellaneous backward compatibility improvements