Small fixes, increased command line timeout