Modify some steps to ensure compatibility / better to prevent than to treat