Remove undescriptive short options
Fix missing-field-initializers warning