Minor fixes; crutch for unknown options