Fix options parser and keep-going implementation