Minor updates to parent id handling, allows command line override and local parent