Minor fixes

Fixed the generation of prefix-lists