Fix use of $@ to "$@" so that parameters with spaces are expanded/passed properly