* Fix some command-line propagation issues