Fixes list and gen