Be more conservative on some implementation details