Fixed command-line option handling