Small fixes for backward compatibility