Fixes to make sure all command-line options function correctly