Fixed issues regarding using quotes in arguments.