Fixed -L listing generation and improved listing speed