Adjusted maximum retries on various commands