Fixes for new standards