Minor changes to argument parsing for subscribers