Fix modernization issues