Don't include files in container listing
Use correct variable for extra arguments