Fix to screens and ARGV pass-through