slight adaptions for buildlist generator