Modernize some packages