more twentytwenty fixes